Merge
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 6 Aug 2010 17:35:02 +0000 (18:35 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 6 Aug 2010 17:35:02 +0000 (18:35 +0100)

Trivial merge